Fix stuttering