Hopefully fixed the random freezing