Fix for setting and replacing labels in the same batch call