VID-1904 better solution for image display bug