Estimate to Sales Order bug in sequence

When I issue an Estimate, I usually want to convert it to a Sales Order when it has been accepted. When I go to that Estimate and select Convert To Sales Order in the drop down menu it tells me only Accepted Estimates can be made Sales Orders. Ok, so I select Accept Estimate. But it then immediately creates an Invoice. It should not do that!

The only way to then be able to convert the Estimate to a Sales Order is to delete the created Invoice, go back to the Estimate and again select Convert To Sale Order.

Could this be fixed...? Or could you change Convert to Sales Order to be "Accept and Convert to Sales Order"?

Thanks,
-Tom