SW-31. Committing fix from Giuseppe Ribezzo.