Fix the contentious 1-D images once in for all