More fixes discussed in the pull request #119