ENG-6317 Re-added conditional to remove chance of dividing by 0