Fixed some issues with the getFieldValues