Fixed slow bug