Fix speed bug