Fix. Closes gh-2