CRM-13973 : fix for #comment-58346