Solves issue #4