Merge pull request #4866 from sotux/bugfix