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