Fix use of GAP.