Solves issue #41