fixed issue #1 #2 #3