Fix [ bug #1516 ]