Issue: #136 may - june - 2008