Make sure callerinfo is always accurate