fixed bool logic