same fix for 5.7