my-iss-574-fix
Merge pull request #576 from rcrovella/iss-574-fix

my-iss-574-fix