Another attempt to workaround initialisation bug