Issue #45 fix(part1)