Merge pull request #1168 from Young-X/fix_dev