Solves issue #63