Fix bug - part 2