removed spurious if condition