fix #36
fix #28