BugFix (#220) and adapted ExportVisitorTest