Fix automatic skip to next