GSP fix for #847