CRM-7964 fix on previous eval replacement

looks like last PR was pulled before this was loaded into it