GAP Bug fixed