There is no solution right now, but be careful what you're saying.
You were pointing out it affects mostly all of his faces..
But the only cases i know for now are the two you are mentioning here..