Fix speed problem