Code improvement
Merge pull request #1715 from juancarlospaco/fix/resource

Code improvement