Fix cleanly the issue 410
Merge pull request #416 from seal20/Fix410Clean

Fix cleanly the issue 410