Solves issue #115