Make same update as pull request #2 on this page