Bugfix for issue #14