fix something broken by merge