fix issue #1, ported in the unstable branch too
fix issue #1, ported in the unstable branch too

dmachard/extensive-testing,dmachard/extensive-testing,dmachard/extensive-testing,dmachard/extensive-testing,dmachard/extensive-testing,dmachard/extensive-testing,dmachard/extensive-testing,dmachard/extensive-testing