Imrove skip behavior