Changed the way it handles spoiled images