fix #49
fix #48