Fix missing safeName call