Fix issue #1 and #3