Fix unstable build take 3