fix in handling ForcedTarget/TARGET variables