BugFix for #260