>You could try moving the disable to the very first line of the function and then re-enable in the 'else;

That would be simpler to implement and wouldn't require going up into the framework to handle that enhancement.

Thanks