change to interceptor - quick fix