fix #408
fix #407