Extra if-test