Attempted fix to attempted fix