Fix user-selected imagery
P2 is like crystal, it breaks easy