Added extra check.