Fix for display of images after upgrade (ADW-762)