Special fix for EACG