Add Support to 1.7.9/1.7.10 (remove lag spikes)