Quick and dirty fix for design flaw in target scope implementation.