fix issue #2 #5