It is an ugly fix. But as yesterday proved, there's no other way, unfortunately :(