solves issue #11