Bug fix for bootstrap