Fix regarding issue #3