Bug in velocity calculation

…caused by using same variable twice. One was in a list comprehension,
and its final value was passed on the variable of the same name in the
rest of the loop. FML.