Fixed bug caused by renaming of DOM element
For #master