Since it do fix something on your avalon. I merge part this patch here 7b698e2. Please test that patch and give us more feedback. thanks for pull request.