Fix for policy interceptor