Issue: #132 September - October - 2007