fix #50 #49