fix #49 #50