Fixed data get issues