Merge pull request #2062 from unxed/minor-fix