fix speed change handling.