fix #51, fix #54