Fixed threading issues caused by me being silly