Fixing 1.3-1.4 upgrade bug with old data