fix data serving smashing