Put Vincent's modification into sprint

FYI PR.