fixed #1551
cdb