Fixed issue #1 and #2
Fixed issue #1 and #2