Trying to fix record not found