Merge pull request #3522 from lucasvieites/patch-2