Fixed John Leonard's photo extension