fix #51(wip)