Fixing the mess caused by bootstrap.