Fix auto height bug (again)