Solves issue #21