Mergin in Xiao's fix