#98 code review - fixing