The new logic for the image descriptors should fix the new bug reported by Bob