Added extra checker