Included fix where user clears data manually