Separated bootstrap patch up to be DRY