Fixing rebase issue for Mandy's pull request