apply same fix as e1d62 but elsewhere