- solves issue #8