Fix on threading