Fix for single expectedsubscriber