Fix. Closes gh-4