closes #61, fixes #62