Fixed an issue with toolbar