issue #6 and #8