Merge Fix

Once more. With feeling.