Solves issue #6