Bug fix on BootStrap