Solved bug
wip