Fix issue with "killed by World" message