Fix image tracking