Fix server side
Debugging