Should have fixed error on death