Issue: #154 May - June - 2011