dbmaker bug fix