Small Merge Fix