Fix data overflow