Using correct references for velocity transitions