Issue: #123 March - April - 2006