Works again but still data race