solves issue #2