Fixed skip logic