Fixing merge problem on previous commit.