fix merge by Berto