attempted fix - part 2