Fixed: Advance if skip calls for it