fixed bug after merge