Bug #7 solved.