Added extra check to be on the safe side