Minor Merge Fix