Fix #1389
Merge pull request #1391 from wild-billy/viromaint

Fix #1389