partially resolve issue #61