fixes #77
fixes #113