diff --git a/lib/prawn-fillform.rb b/lib/prawn-fillform.rb
index f9b0c22..250b390 100644
--- a/lib/prawn-fillform.rb
+++ b/lib/prawn-fillform.rb
@@ -224,7 +224,7 @@ def fill_form_with(data={})
           if value.nil?
             value = data[field.name].fetch(:value) rescue nil
           end
-          options = field_hash.fetch(:options) rescue nil
+          options = data[field.name].fetch(:options) rescue nil
           options ||= {}
 
           if value
@@ -235,6 +235,7 @@ def fill_form_with(data={})
             if field.type == :text
               fill_color options[:font_color] || field.font_color
 
+	      font options[:font_face]
               text_box value, :at => [field.x + x_offset, field.y + y_offset],
                                     :align => options[:align] || field.align,
                                     :width => options[:width] || field.width,