Fix: #1425
Enh : Tests - #1425