yet another fix for bogus if-conditions