3er fix merge