Removed unneccessary condition