Fixing the hidden overflow (fixes #11)