Fix auto exapnd