Fixed bug caused when 'field_' is detected anywhere in field name

Signed-off-by: Elliot Condon <e@elliotcondon.com>