another fix for v9.6