FIX Issue #6

Fixing hard coded field names