fix #40
fix #39