fix #28
fix #26