Fixing pull request number 231