Fix https://github.com/jonesde/moqui/issues/28