Fixed boolean problem