skip logic fix