Fix bug that occurred because of incorrect merge