Fixing interceptor problems