Fix image handler