If you have lots of targets with this issue we can talk about a way to DRY this hack up