extend issue #104