Fixes skipping