@User: Thanks. I'm working on a fix in magic to avoid the complicated sleight-of-hand in the middle.