another fix for recent commits