fix boolean handling