Fix image ordering problem