Fix Indicator Display bug