Issue: #138 September - October - 2008