Fix #1609 --------- Signed-off-by: George Araujo <george.gcac@gmail.com> Co-authored-by: Maruan Al-Shedivat <maruan@genesistherapeutics.ai>