MergeFix#3