Another experiment to fix a new FOREIGN KEY issue.