Thanks for the reminder. Attached is a slightly different way of fixing the problem. (This works for me, however, I would appreciate if you could check it on your test cases as well.)
I did not patch the OGRE wizard because it is more complicated, and I do not currently have OGRE installed to test with.