Issue: #117 March - April - 2005