CRM-16257 resolved regression caused by previous commit for issue CRM-16157