Issue #45 fix(part 3)