Workaround nasty race