solves issue #58