Merge "Fixing divide by zero"