fixed #486
Merge pull request #488 from Atheros1/master

fixed #486