same fix as last commit