fixed boolean handling