Fix double data entry issue