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