Resolves incompatibility with obfuscate_id