fix skip logic