Merge pull request #1675 from rzhxeo/fix