fixes #347 - add internal field support