Fixed minor isue with overlapping field