Fix issue #2 and #7