Merge "Avoid theoretical division by zero"