- solves issue #20