- solves issue #21
- solves issue created while trying to solve #33