another fix for recent freeze