Merge Fix 2 - After Final