Fix for subject migration