[B#1204] updated logic to display correctly