Issue: #135 March - April - 2008