Capture now works with macros, closes #1534