Fix data input mechanic