fix issue #1 #2