FIXED: Error in display logic