fixes #69 fixes #68: