Adding same fix for mono