Removed redundant condition check