fixing issue #1136

Adding test and fix for issue #1136 (https://github.com/NServiceBus/NServiceBus/issues/1136)