Bug fixing
WIP