Merge fix word_cravip