- solves issue #22