Refactored Interceptor should fully work now