Fix: [ bug #1425 ]