BugFix, see change log