Bug fix part 2.