resolve issue #5