I was going to suggest the same approach, but Morten was faster ;)
@jepkri Can you test this solution in your case? I feel that this should be "future-proof" ;)