Fix the photo exchange bugs