Fix bug 2 of report #4