Fixing LIVEOAK-683
Merge pull request #401 from cardosogabriel/master

Fixing LIVEOAK-683