wip: fix code