solves issue #17