CRM-7964 fix on previous eval replacement