issue #8 and issue #9