made change from commit 4e76e706e324f85c077a7a2ef7f1b0b37c0327db to master branch