wip, fix method