More checks - fix