Hi,
I suspect you have the same problem as I have - go to the General Config page and on the lower left there is a block regarding the actions after a M30. Uncheck the 'remove offsets on program end' tick box and voilá....well, worked for me anyway!
Simon