Delphi Toolbar Ordering Problem

I am currently using Delphi XE and have noticed an issue with the toolbar component (TToolbar) and the ordering of the buttons. What happened is that I added a toolbar to a form and then added some buttons, all worked fine, but when I reordered the buttons then set them back to the original order the properties when selected did not match the button selected. For example I would select a button and change the enable property and it would change another button to enabled or disabled. The fix for this issue is to add a new button and remove it, adding a new button must do some sort of re-indexing of the buttons.