Added extra checks