Fixed boolean handling