dtp/issue 9

Fix for #9