fixes #87
fixes #87 fixes #88