Issue #9: part 2