fix #40
fix #1