Issue: #165 April 2013