Fixing last commit, issue #110