minor trimming, trying to diagnose #538