Updated for v2.4.9.6