Added extra check