Merge pull request #2083 from 9rnsr/fix10178

Fix up for bug 10178