GAP bug fixed