Fix #417 Macro wizard now works.