Improve display (thx to Dominique)