bootstrap bug fixing