Fixes https://openhatch.org/bugs/issue944