Try to fix math again