Bug Fix with division by zero