Interceptors fix