fixing 5950
Merge pull request #45 from ycastillo/yoselyn.test

This is the change for 6015