fixed shameful boolean handling