fix photo bugs
further fix photo-bug