[#122] Fixing crash and reparing the % limit correct