4er fix merge