Implemented #103 for GSI as well