Solves issue #18