Resolve issue 858
Merge branch 'fix/issue858'

Closes: https://openhatch.org/bugs/issue858

Thanks to Aaron1011 for finding and fixing this, lickety split!