Fix for exposedtargetmsg