diff --git a/fieldExtraction/src/investment/aarete_derived.py b/fieldExtraction/src/investment/aarete_derived.py
index 90af587..7494881 100644
--- a/fieldExtraction/src/investment/aarete_derived.py
+++ b/fieldExtraction/src/investment/aarete_derived.py
@@ -77,9 +77,12 @@ def get_crosswalk_fields(answer_dicts: list, constants: Constants):
                         answer_dict[to_field_name] = crosswalk.mapping.get(
                             from_field_value
                         )
-                    elif from_field_value in crosswalk.create_reverse_mapping().keys():
-                        answer_dict[to_field_name] = (
-                            crosswalk.create_reverse_mapping().get(from_field_value)
-                        )
+                    elif from_field_value in crosswalk.mapping.values():
+                        if "AARETE_DERIVED" in to_field_name:
+                            answer_dict[to_field_name] = from_field_value
+                        else:
+                            answer_dict[to_field_name] = (
+                                crosswalk.create_reverse_mapping().get(from_field_value)
+                            )
 
     return answer_dicts