ToolBar fix