Fix follow Google Changes