Attempted fix 3