Unfortunately not, we have to bite the bullet and adjust our code....