moved per issue #40