Issue: #129 march - april - 2007