fix #300 part 1