Added extra guards..