Fix/1203 2239

- One commit for the fix itself
- The other one for testing/validating the new fix