Fix records messing up