Fixes #63 and fixes #62.