fixes #111 fixes #113