Speed Up - Fix skip conditions