Fix toolbar_helper