fix #28
fix #33