- solves issue #43