Tried to fix freeze by removing some synchronization