Fix db call before the next big commit