Fix for IVR use case