Fixing the check to see if we need to bootstrap or not to something that works better