Ref table fix
First element implementation