Corrections from issue #5