resolve issue #8