Fixes #42. Fixes #43.