Stuttering issue (Fixes #58)