Beta fix for any item loosing meta-data