Fix for button attr ids
v2.1.1