removed redundant condition