Issue: #131 July - August - 2007