Fix bug regarding MessageStoreInterceptor