Fixed data typing issue