Minor modification to Anand's pull request