another fix for gs avoiding