BugFix #1 undone