Fixed data issues with Size