Fix key format