A few changes releated to pull request #168