Attempt to fix related math