Fixing calculations