Fix layer for old location code