A fix for the unlimited playback, this closes #4