Issue: #124 May - June - 2006