Fix issue from WaarpR66 2.4.22