Solves issue #166