Fix based fields
Merge pull request #15 from marcingy/8.x-1.x

Fix based fields