Removing underscore before dynamic field