Resolution issue #4