Fixed DO errors.
Merge pull request #1590 from shivalinga/dev-branch

Fixed DO errors.