fix #38. fix #35.