Bugfix. Closes #28.