fix merge845