Working on fix record routine