Fixed issue #1 and issue #3