Fix object key construction