Fixed so that OnUpdate triggers correctly on each Generic global instance