Bugfix to support gs