fix #25
fix #24