fix #590
Merge pull request #595 from Atheros1/master

fix #590