fix to Issue 7