Suport old location format