Fixed data structure issue