solves issue #42

And there.