fix #52
fix #54
fix #54