fix after db merges