Bug fix for captions