fixed bugs related to skipping