Fixes https://github.com/Particular/NServiceBus/issues/1837