Restore bad pull request #483
Merge pull request #486 from robertatakenaka/fix_pr_483

Restore bad pull request #483