Fixed bug in the interceptor