fix for data-server crashes