Fix concurrent callback calls