Feature/fix divide by zero