fexed after merge v2