Dirty bootstrap fix