Fix #471 - courtesy of satyr
Remove old code
Merge pull request #472 from Nami-Doc/issue471

Issue #471