towards issue #8