Fixed fields
Merge pull request #45 from ajstanley/7.x

Fixed fields