fixed skip conditions