RichPicture FixMe