Removed redundant if check