Add check for zero speed