Attempted fix redux