Fixed issue on random data entry