Fix AttributeError bug due to merge problem.