Fixing stuttering bug