Fixed skipping problem