Change to explicit boolean check