fix #60
fix #59