Fix the issue #1 and #2