Hopefully a full final fix