wooo finally fixed freeze bug