Fix GA (with boilerplate)