attempted fix - part 1