Fixed boolean returns