Hopefully fixed the weird lock up problem