Fixed merge conflict for pull req #1451