Fix on death build