#53: change interceptor position (again), fix generics