stupid ambiguous if statement removed