Minor improvement to skip-right behavior