Quick fix - part 2