Issue #77 fixes some issues