Event interceptor fix