fix #26
fix #24