- solves issue #14