resolve issue #13