Fixed references by nuking and restoring :(