Done, issue #351.