Fill velocity buffer correctly