Fixed Error of Division by zero
merges