Removed unneeded if  check