One last fix before we go back to square one with bootstrap