fix skip functionality