Fix sort order.
Use ObjectMetadata() for correct identification.