- bugfix for issue #17