Merge pull request #1185 from Young-X/fix