[wip] fixed bug