Attempt to fix Merge of Death