Fixed bugs caused by merge i236