Fix slow bug