closes #114, fixes #106