Fixed issue #2, #3