Fixed  bug in Toolbar class