fixed #355
Merge pull request #360 from SunLightJuly/fix_bug_355

fixed #355