[3.8] Fix caption display