Fixed data input bug