removed redundant conditional