added a fix, looking to improve it if possible. Generally displeased with the implementation
added a fix, looking to improve it if possible. Generally displeased with the implementation

MediaComplete/MediaComplete,MediaComplete/MediaComplete