fixing skip logic