Fix for bug https://github.com/openhatch/oh-mainline/issues/1401