Fixed skiping problem