Toolbar extra fix.