Fix the last the border effects of the last commit.