Fix potential issue with entry display