removing usage of fix method (wip)