Per issue #45