fixes 10 of #69
fixes #77