Fix TargetPoint to be static