Bug fixing WIP
WIP bug fixing