Correcting a stange behaviour. Little modification of the interface.