Fixed bug after merge