Fix bug in GBS