Fix write barrier