Fixed parse keys