as per issue #61