Adjusted location of the end tags