fix #300 part 2