removed redundant conditional check