fix #241 #242