Fixed a bug with the toolbar