Fixing bootstrap crash