Fixing bug
WIP