fix #53, fix #52