Resolution issue #3