fix #49, fix #54