Issue: #118 May - June - 2005