fix #50, fix #51