More work on CRM-12859