applying the proposed fix from #110