Speed bug fixed