slow bug fixed