Issue #45 fix(part 2)