field limitation fixes