implemented: issue #290