Fix to make it work with Intercessor.