fix GA support