Add guard for division by zero
after merge manually