Fix issue unit cap