Bugfix when no skip