Bugfix: Encoding in macroresolver