Merge Fix 2