Fixed the reassign of taxonomies
Merge branch 'fix'