Fixed the slowdown caused by merge