Improved skip handling