removed redundant check