BP shift bug removed