Fix issue #4 and #7