Fix small glitch when stopping due to the fix for #3