fix #292 part 2