Display fix - should not be disposed!