[cdi-dev] Review of proposed fix for CDI-78