WIP: Fixing bug