[wip] bug fix