Fixed bug (WIP)