fix #22
fix #23