Fixes https://github.com/Particular/ServiceMatrix/issues/385