fix #37
fix issue #37