hopefully resolving the freeze issue