Protect against format changes