Group pricing condtions not fully processed in Save_document_prepare

We have a piece of code in save_document_prepare, that loops against XKOMV and if there's and EDI1, customer expected price, it compare and either added a delivey block or just sends an email.

We added a new group condition and at the time this code is executed, it doesn't appear that all the group condition processing has finished and we are getting mixed results. If I move the code to save_document all is fine, but then I can't set the delivery block.

Any ideas? Kind of sounds like a bug to me. The group condition processing that is.

Thanks