Fixes and closes gh-14.