better check before commit..