critical bugfix for conditionals