partly fix issue #1 and #2