revert back one change related to issue #723