Minor alteration to earlier fix for handling odd metadata values