Migration 0006; more comprehensive fix.