Fix caption display
Merge pull request #1062 from nlegoff/fix-caption

[3.8] Fix caption display