Fix issue where tags not always being set.