Improve the placement of begin..end attributes (#2551)

Improve the placement of begin..end attributes (#2551) #562