Bugfix for issue #1.