Fixed bug
WIP