Issue #203 fixes some errors from previous commits