Removed unnecessary condition