Bug fix 2.2: Re-implemented interceptors.