Fix toolbar destruction

Fix #443