same fix in other parts of code