implementation see issue #290
bugfix see issue #318