Mighty and powerful spoiler-image fix!
(Still far from ideal)