GS bug fix