Fixed Merge issue from last commit.