Modification made in PR 599