AMGA-13 Fix for custom field
Merge pull request #10 from Edzelopez/AMGA-5

AMGA-13 Fix for custom field