Bugfix for huge values