resolve issue #9