Sharepoint Workflow is still recursive on item change even with sp2

I have a basic workflow programmed in Visual Studio 10 for a sharepoint site. It fires on a list item change or creation. The wo开发者_Go百科rkflow basically sends an email, changes the value of one of the item fields and updates the field.

The problem: Before sp2, this should create a recursive workflow where the workflowproperties.Item.Update re-calls the items on-change event and restarts the workflow and I end up with a bunch of emails in my inbox.

From my research, sp2 was supposed to eliminate this but it seems to be still happening to me.

From what I've researched, my version number 12.0.0.6421 is from SP2 so I shouldn't be getting this problem.

Any ideas how to stop the recursion?

Thanks in advance.

Disableeventfiring is your friend when updating list items.