apply Tom's fix for recent ?regression?