Bug #1 solved!