Fix disable check if statements