Addition to closed issue #2 (The same fix for Rescript)