fix GS class detection with the Class picker book