BugFix #239