fix for previous workaround
fix for broken tests