added per issue #156