Add a silly hack for avoiding breakage at startup