fixes #91 fixes #220 (cherry picked from commit b25b80ea)
mentioned in issue #91 (closed)
mentioned in issue #220 (closed)