fixed #242 #243