Another places for bug #2