Fix auto height issue