Fix retrieval of option fields for certain classes