Fix the skip logic