Pull request/d71b5df3

See #1652. Done. And faster than expected.