resolve issue #7