Patch around Gambit issue #37