Bug fix: original GSS model is back