Fix unstable build