fixes #132 fixes #131