Fix number doubling bug
Merge branch 'hotfix/fix_number_doubling'