Fixing the skipping functionality