one more set of image fixes before attempting to fix the merge with #25