Fixed skipping issue