Fixed return value for method. #6095
Merge pull request #6097