fix issue #50 #51