#40
fix #41