Fixes #29: Math is still wrong