Another attempt at fixing the runtime.