Issue: #126 September - October - 2006