removed undef/null comparison