Per issue #44