Quick fix for crashing server

Undo when investigating which schema does this