[BugFix #548]