Avoid bootstraping issues