Bugfix for issue #101.