major fix for runtime server crash