fixed a bug in w/ skipping