Fixed errors caused by merging