This version fixes a possible crash qhen editing photos.