Preserve images when reordering. Fixes #71, Ref #68